Merge from emacs-24 branch
authorChong Yidong <cyd@gnu.org>
Sun, 15 Apr 2012 07:31:15 +0000 (15:31 +0800)
committerChong Yidong <cyd@gnu.org>
Sun, 15 Apr 2012 07:31:15 +0000 (15:31 +0800)
commit3d93c238d3f01a25f191805a47c83b6312045a34
tree24ea34e586ea211303fe4ba5e0ced4d2eb30d02a
parent9f2c2ce2ec31d3667e7429ec33484bf341518d8b
parent2dbcca29a25dc95e0a89ff8d994d533f989d7bf9
Merge from emacs-24 branch